Make GtkPrintFunc take a const string argument like GtkTranslateFunc. This

Fri Jan 21 16:16:29 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkitemfactory.[ch] docs/Changes-1.4.txt: Make GtkPrintFunc
	take a const string argument like GtkTranslateFunc. This will
	require changes in use code.

diff --git a/ChangeLog b/ChangeLog
index f0a46a7b8b14a715e3b61680c651cd8e356e7553..b6c5c32a6302800259f53104e652f8189e2bcca2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jan 21 16:16:29 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkitemfactory.[ch] docs/Changes-1.4.txt: Make GtkPrintFunc
+       take a const string argument like GtkTranslateFunc. This will
+       require changes in use code.
+
 2000-01-19  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkwindow-win32.c (gdk_window_clear_area): The correct

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index f0a46a7b8b14a715e3b61680c651cd8e356e7553..b6c5c32a6302800259f53104e652f8189e2bcca2 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Fri Jan 21 16:16:29 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkitemfactory.[ch] docs/Changes-1.4.txt: Make GtkPrintFunc
+       take a const string argument like GtkTranslateFunc. This will
+       require changes in use code.
+
 2000-01-19  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkwindow-win32.c (gdk_window_clear_area): The correct

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f0a46a7b8b14a715e3b61680c651cd8e356e7553..b6c5c32a6302800259f53104e652f8189e2bcca2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Fri Jan 21 16:16:29 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkitemfactory.[ch] docs/Changes-1.4.txt: Make GtkPrintFunc
+       take a const string argument like GtkTranslateFunc. This will
+       require changes in use code.
+
 2000-01-19  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkwindow-win32.c (gdk_window_clear_area): The correct

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f0a46a7b8b14a715e3b61680c651cd8e356e7553..b6c5c32a6302800259f53104e652f8189e2bcca2 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Fri Jan 21 16:16:29 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkitemfactory.[ch] docs/Changes-1.4.txt: Make GtkPrintFunc
+       take a const string argument like GtkTranslateFunc. This will
+       require changes in use code.
+
 2000-01-19  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkwindow-win32.c (gdk_window_clear_area): The correct

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f0a46a7b8b14a715e3b61680c651cd8e356e7553..b6c5c32a6302800259f53104e652f8189e2bcca2 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Fri Jan 21 16:16:29 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkitemfactory.[ch] docs/Changes-1.4.txt: Make GtkPrintFunc
+       take a const string argument like GtkTranslateFunc. This will
+       require changes in use code.
+
 2000-01-19  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkwindow-win32.c (gdk_window_clear_area): The correct

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f0a46a7b8b14a715e3b61680c651cd8e356e7553..b6c5c32a6302800259f53104e652f8189e2bcca2 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Fri Jan 21 16:16:29 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkitemfactory.[ch] docs/Changes-1.4.txt: Make GtkPrintFunc
+       take a const string argument like GtkTranslateFunc. This will
+       require changes in use code.
+
 2000-01-19  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkwindow-win32.c (gdk_window_clear_area): The correct

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f0a46a7b8b14a715e3b61680c651cd8e356e7553..b6c5c32a6302800259f53104e652f8189e2bcca2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Fri Jan 21 16:16:29 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkitemfactory.[ch] docs/Changes-1.4.txt: Make GtkPrintFunc
+       take a const string argument like GtkTranslateFunc. This will
+       require changes in use code.
+
 2000-01-19  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkwindow-win32.c (gdk_window_clear_area): The correct

diff --git a/docs/Changes-1.4.txt b/docs/Changes-1.4.txt
index 6b6563f276726e68f9e891df47d3838ae7767e6a..3009ee96ab1c0ac4cdd290bfa6a573d2ee4919b7 100644 (file)
--- a/docs/Changes-1.4.txt
+++ b/docs/Changes-1.4.txt
@@ -4,4 +4,6 @@ Incompatible Changes from GTK+-1.2 to GTK+-1.4:
   has been unused since the main loop was moved into GLib
   prior to 1.2. 
 
-
+- The signature for GtkPrintFunc (used for gtk_item_factory_dump_items)
+  has been changed to take a 'const gchar *' instead of 'gchar *', to
+  match what we do for glib, and other similar cases.

diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c
index 8f73b8b6c0c0be2964e9295465838dd91de13f2e..c47ee8d278d58a78100be11f21a5df4a4f47c630 100644 (file)
--- a/gtk/gtkitemfactory.c
+++ b/gtk/gtkitemfactory.c
@@ -778,8 +778,8 @@ gtk_item_factory_dump_items (GtkPatternSpec  *path_pspec,
 }
 
 void
-gtk_item_factory_print_func (gpointer FILE_pointer,
-                            gchar   *string)
+gtk_item_factory_print_func (gpointer     FILE_pointer,
+                            const gchar *string)
 {
   FILE *f_out = FILE_pointer;
 

diff --git a/gtk/gtkitemfactory.h b/gtk/gtkitemfactory.h
index dcf21514abc425409d8841c85ce0757a417bb1e4..6b7c21e367c6c8b45645664b8f6fca2ea551acf6 100644 (file)
--- a/gtk/gtkitemfactory.h
+++ b/gtk/gtkitemfactory.h
@@ -42,7 +42,7 @@ extern "C" {
 
 
 typedef void   (*GtkPrintFunc)            (gpointer             func_data,
-                                           gchar               *str);
+                                           const gchar         *str);
 typedef gchar * (*GtkTranslateFunc)       (const gchar         *path,
                                            gpointer             func_data);
 typedef        void    (*GtkItemFactoryCallback)  ();
@@ -172,7 +172,7 @@ void        gtk_item_factory_dump_rc        (const gchar            *file_name,
                                         GtkPatternSpec         *path_pspec,
                                         gboolean                modified_only);
 void   gtk_item_factory_print_func     (gpointer                FILE_pointer,
-                                        gchar                  *string);
+                                        const gchar            *string);
 void   gtk_item_factory_create_item    (GtkItemFactory         *ifactory,
                                         GtkItemFactoryEntry    *entry,
                                         gpointer                callback_data,